[openssl] uprev to 1.0.1c Only real merge conflicts were ih /apps/verify.c, where a function argument's type had changed. TEST=security_OpenSSL*,trybot BUG=chromium-os:21100 Change-Id: I9f3d8638cfcab7b4b3c2906a62a5d3a7b2ba3ec6 Signed-off-by: Elly Jones <ellyjones@chromium.org> 
diff --git a/FAQ b/FAQ index 2a271ed..bb6f7e2 100644 --- a/FAQ +++ b/FAQ 
@@ -10,6 +10,7 @@  * Why aren't tools like 'autoconf' and 'libtool' used?  * What is an 'engine' version?  * How do I check the authenticity of the OpenSSL distribution? +* How does the versioning scheme work?    [LEGAL] Legal questions   @@ -82,7 +83,7 @@  * Which is the current version of OpenSSL?    The current version is available from <URL: http://www.openssl.org>. -OpenSSL 1.0.0g was released on Jan 18th, 2012. +OpenSSL 1.0.1c was released on May 10th, 2012.    In addition to the current stable release, you can also access daily  snapshots of the OpenSSL development version at <URL: @@ -108,7 +109,9 @@  <URL: http://www.openssl.org/docs/>. Note that the online documents refer  to the very latest development versions of OpenSSL and may include features  not present in released versions. If in doubt refer to the documentation -that came with the version of OpenSSL you are using. +that came with the version of OpenSSL you are using. The pod format +documentation is included in each OpenSSL distribution under the docs +directory.    For information on parts of libcrypto that are not yet documented, you  might want to read Ariel Glenn's documentation on SSLeay 0.9, OpenSSL's @@ -173,6 +176,19 @@    pgp TARBALL.asc   +* How does the versioning scheme work? + +After the release of OpenSSL 1.0.0 the versioning scheme changed. Letter  +releases (e.g. 1.0.1a) can only contain bug and security fixes and no +new features. Minor releases change the last number (e.g. 1.0.2) and  +can contain new features that retain binary compatibility. Changes to +the middle number are considered major releases and neither source nor +binary compatibility is guaranteed. + +Therefore the answer to the common question "when will feature X be +backported to OpenSSL 1.0.0/0.9.8?" is "never" but it could appear +in the next minor release. +  [LEGAL] =======================================================================    * Do I need patent licenses to use OpenSSL? @@ -284,7 +300,7 @@  Check out the CA.pl(1) manual page. This provides a simple wrapper round  the 'req', 'verify', 'ca' and 'pkcs12' utilities. For finer control check  out the manual pages for the individual utilities and the certificate -extensions documentation (currently in doc/openssl.txt). +extensions documentation (in ca(1), req(1), x509v3_config(5) )      * Why can't I create certificate requests?